Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

copr: avoid NPE when store is not available when balance batch cop task (#28110) #28139

Merged
merged 4 commits into from
Sep 17, 2021
Merged

copr: avoid NPE when store is not available when balance batch cop task (#28110) #28139

merged 4 commits into from
Sep 17, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Sep 17, 2021 •
edited
Loading

cherry-pick #28110 to release-5.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/28139

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/28139:release-5.1-c6dfd705e11a

What problem does this PR solve?

Issue Number: close #28096

Problem Summary:
As described in the issue.

What is changed and how it works?

Proposal: xxx

What's Changed:

How it Works:
The root cause is in L162, it tries to get err.Error() even if err is nil

tidb/store/copr/batch_coprocessor.go

Lines 161 to 167 in b839744

if err != nil || !resp.Resp.(*mpp.IsAliveResponse).Available {
logutil.BgLogger().Warn("Cannot detect store's availability", zap.String("store address", s.GetAddr()), zap.String("err message", err.Error()))
mu.Lock()
mppStoreLastFailTime[s.GetAddr()] = time.Now()
mu.Unlock()
return
}

The pr fix it by only get err.Error() if err is not nil.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note 

Fix a bug that TiDB may crash when TiFlash is shutting down.

@windtalker @ti-srebot
cherry pick pingcap#28110 to release-5.1
3c355ee 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 17, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • fzhedu
  • qw4990

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Sep 17, 2021
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Sep 17, 2021
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2021
Merged
12 tasks
@ti-srebot ti-srebot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.1-cherry-pick labels Sep 17, 2021
@ti-srebot ti-srebot added this to the v5.1.1 milestone Sep 17, 2021
@ti-srebot
Copy link
Contributor Author

@windtalker you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 17, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Sep 17, 2021
fzhedu
fzhedu approved these changes Sep 17, 2021
View reviewed changes
Copy link
Contributor

@fzhedu fzhedu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/LGTM

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 17, 2021
@fzhedu
Copy link
Contributor

fzhedu commented Sep 17, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 3c355ee

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 17, 2021
@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 6b0c1a3 into pingcap:release-5.1 Sep 17, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.1.1, v5.1.2 Sep 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qw4990 qw4990 qw4990 approved these changes

@fzhedu fzhedu fzhedu approved these changes

@hanfei1991 hanfei1991 Awaiting requested review from hanfei1991

Assignees

@windtalker windtalker

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/5.1-cherry-pick
Projects
None yet
Milestone
v5.1.2
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @ti-chi-bot @fzhedu @qw4990 @windtalker @zhouqiang-cl